Refresh patches

diff --git a/debian/changelog b/debian/changelog
index 180d05b623a4a7526cf12f96d2e732b3280113c5..c0872cedc599977f290c21d44430b7b41bfadb49 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ utf8proc (2.1.1-1) UNRELEASED; urgency=medium
   [ Graham Inggs ]
   * New upstream release
   * Update upstream URLs for move to JuliaStrings
+  * Refresh patches
 
  -- Graham Inggs <ginggs@debian.org>  Sat, 07 Jul 2018 08:30:46 +0000
 

diff --git a/debian/patches/unicode10.patch b/debian/patches/unicode10.patch
index dc5d315fd67e1f0ffa30f8877a207f310ae0f7c9..453520f67191581d75ab9c6d0542af2afdedc8b6 100644 (file)
--- a/debian/patches/unicode10.patch
+++ b/debian/patches/unicode10.patch
@@ -107,7 +107,7 @@ Last-Update: 2017-07-07
 -  38656, };
 +  39424, };
  
- const utf8proc_uint16_t utf8proc_stage2table[] = {
+ static const utf8proc_uint16_t utf8proc_stage2table[] = {
    1, 2, 2, 2, 2, 2, 2, 
 @@ -1992,8 +1992,8 @@
    1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 
@@ -3350,7 +3350,7 @@ Last-Update: 2017-07-07
 +  3985, 3985, 3985, 3985, 3985, 3985, 3985, 0, 
    0, };
  
- const utf8proc_property_t utf8proc_properties[] = {
+ static const utf8proc_property_t utf8proc_properties[] = {
 @@ -9055,8 +9151,9 @@
    {UTF8PROC_CATEGORY_SO, 0, UTF8PROC_BIDI_CLASS_L, UTF8PROC_DECOMP_TYPE_CIRCLE, 25, UINT16_MAX, 8746, UINT16_MAX, 8746, UINT16_MAX, false, false, false, false, 2, 0, UTF8PROC_BOUNDCLASS_OTHER},
    {UTF8PROC_CATEGORY_NO, 0, UTF8PROC_BIDI_CLASS_ON, UTF8PROC_DECOMP_TYPE_CIRCLE, 2775, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, UINT16_MAX, false, false, false, false, 2, 0, UTF8PROC_BOUNDCLASS_OTHER},

diff --git a/debian/patches/use-unicode-data.patch b/debian/patches/use-unicode-data.patch
index ce709065a41332ad1886d72b66cc09fe50fa0a2d..1b1cb78105ff2bcdc4c7c93bce06644a944c8617 100644 (file)
--- a/debian/patches/use-unicode-data.patch
+++ b/debian/patches/use-unicode-data.patch
@@ -33,7 +33,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +UNICODE_VERSION=10.0.0
  
  UnicodeData.txt:
--      $(CURL) $(CURLFLAGS) -o $@ -O $(URLCACHE)http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/UnicodeData.txt
+-      $(CURL) $(CURLFLAGS) -o $@ -O http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/UnicodeData.txt
 +      cp /usr/share/unicode/UnicodeData.txt $@
  
  EastAsianWidth.txt: